Merge from trunk

diff --cc lisp/progmodes/cc-engine.el
index f4a8c0bf46fbd9de568564d3513b5be4e4c4a181,f4a8c0bf46fbd9de568564d3513b5be4e4c4a181..2d28d003fd5be5b346f04f8772a7e7de19a388c0
--- 1/lisp/progmodes/cc-engine.el
--- 2/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@@ -2624,7 -2624,7 +2624,7 @@@ comment at the start of cc-engine.el fo
                           (< (point-max) c-state-old-cpp-end)))
                  (point-max)
                (min (point-max) c-state-old-cpp-beg)))
--      (while (and c-state-cache (> (c-state-cache-top-lparen) upper-lim))
++      (while (and c-state-cache (>= (c-state-cache-top-lparen) upper-lim))
          (setq c-state-cache (cdr c-state-cache)))
        ;; If `upper-lim' is inside the last recorded brace pair, remove its
        ;; RBrace and indicate we'll need to search backwards for a previous